Add locationless and benchmark for GSAK, too. (This is the version in 5.5.1 B16)

diff --git a/gpsbabel/Makefile b/gpsbabel/Makefile
index dbd766034790eab57ef51f1f5f967e06e46d3397..b4a763abce31a1abd54782182a94f364cc745f92 100644 (file)
--- a/gpsbabel/Makefile
+++ b/gpsbabel/Makefile
@@ -90,8 +90,8 @@ dep:
        (echo -n "internal_styles.c: mkstyle.sh " ; echo style/*.style ; /bin/echo -e '\t./mkstyle.sh > internal_styles.c || (rm -f internal_styles.c ; exit 1)' ) >> /tmp/dep
        echo Edit Makefile and bring in /tmp/dep
 
-VERSIONU=1_2_6-beta04122005-gsak
-VERSIOND=1.2.6_beta04122005-gsak
+VERSIONU=1_2_6-beta04302005c-gsak
+VERSIOND=1.2.6_beta04302005c-gsak
 # VERSIONU=1_2_5
 # VERSIOND=1.2.5
 

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index b79cd7540a8e774320526c2e85c8c48116b0a74a..efaedcab1e20e3b5d5848444502064ad38226007 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -111,6 +111,8 @@ typedef enum {
        gt_suprise,
        gt_webcam,
        gt_earth,
+       gt_locationless,
+       gt_benchmark, /* Extension to Groundspeak for GSAK */
        gt_cito
 } geocache_type;
 

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 1cfaf03039b908a8f42c780b45c6295e1d352159..bb465e46d850a415d223c21cd622d642880ad5f0 100644 (file)
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -481,6 +481,9 @@ gs_type_mapping{
        { gt_earth, "Earthcache" },
        { gt_cito, "Cache In Trash Out Event" },
        { gt_letterbox, "Letterbox Hybrid" },
+       { gt_locationless, "Locationless (Reverse) Cache" },
+
+       { gt_benchmark, "Benchmark" }, /* Not Groundspeak; for GSAK  */
 };
 
 struct

diff --git a/gpsbabel/mingw/wintesto.cmd b/gpsbabel/mingw/wintesto.cmd
index 86c14de10b253e21714699a8c9d5795144c7526b..0df95a78d686adbbd9aec48997c4c86f17ef9098 100644 (file)
--- a/gpsbabel/mingw/wintesto.cmd
+++ b/gpsbabel/mingw/wintesto.cmd
@@ -912,6 +912,34 @@ DEL %TMPDIR%\an1.out
 @echo.\r
 CALL :COMPARE %TMPDIR%\an1.out reference\an1-line-out.ref\r
 \r
+REM \r
+REM TomTom .ov2 tests\r
+REM \r
+\r
+DEL %TMPDIR%\ov2.out\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i arc -f reference\google.arc -o tomtom -F %TMPDIR%\ov2.out\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\ov2.out reference\ov2-arc-out.ref\r
+\r
+DEL %TMPDIR%\ov2.out\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i geo -f reference\gl.loc -o tomtom -F %TMPDIR%\ov2.out\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\ov2.out reference\ov2-geo-out.ref\r
+\r
+DEL %TMPDIR%\ov2.out\r
+@echo on\r
+@echo Testing...\r
+%PNAME% -i tomtom -f reference\ov2-geo-out.ref -o gpsutil -F %TMPDIR%\ov2.out\r
+@echo off\r
+@echo.\r
+CALL :COMPARE %TMPDIR%\ov2.out reference\ov2-in.ref\r
+\r
 REM \r
 REM XCSV "human readable" tests\r
 REM \r